gdk/linux-fb/gdkdrawable-fb2.c update to latest Pango API

Sat Nov 24 13:39:51 2001  Manish Singh  <yosh@gimp.org>

        * gdk/linux-fb/gdkdrawable-fb2.c
        * gdk/linux-fb/gdkpango-fb.c: update to latest Pango API

        * gdk/linux-fb/gdkwindow-fb.c: implement gdk_window_show_unraised

        * gdk/linux-fb/gdkfont-fb.c (gdk_font_load): plug memleak on
        set_family

        * gdk/linux-fb/gdkfbswitch.c: minor cleanups

diff --git a/ChangeLog b/ChangeLog
index 093f0add5186629092526e10701fecd802038bf7..905d7ef225253a55cdf7f94ab0171e5c8afb3e01 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Sat Nov 24 13:39:51 2001  Manish Singh  <yosh@gimp.org>
+
+       * gdk/linux-fb/gdkdrawable-fb2.c
+       * gdk/linux-fb/gdkpango-fb.c: update to latest Pango API
+
+       * gdk/linux-fb/gdkwindow-fb.c: implement gdk_window_show_unraised
+
+       * gdk/linux-fb/gdkfont-fb.c (gdk_font_load): plug memleak on
+       set_family
+       
+       * gdk/linux-fb/gdkfbswitch.c: minor cleanups
+
 Sat Nov 24 22:05:27 2001  Kristian Rietveld  <kristian@planet.nl>
 
        * gtk/gtkmenushell.c (gtk_menu_shell_button_release): don't

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 093f0add5186629092526e10701fecd802038bf7..905d7ef225253a55cdf7f94ab0171e5c8afb3e01 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,15 @@
+Sat Nov 24 13:39:51 2001  Manish Singh  <yosh@gimp.org>
+
+       * gdk/linux-fb/gdkdrawable-fb2.c
+       * gdk/linux-fb/gdkpango-fb.c: update to latest Pango API
+
+       * gdk/linux-fb/gdkwindow-fb.c: implement gdk_window_show_unraised
+
+       * gdk/linux-fb/gdkfont-fb.c (gdk_font_load): plug memleak on
+       set_family
+       
+       * gdk/linux-fb/gdkfbswitch.c: minor cleanups
+
 Sat Nov 24 22:05:27 2001  Kristian Rietveld  <kristian@planet.nl>
 
        * gtk/gtkmenushell.c (gtk_menu_shell_button_release): don't

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 093f0add5186629092526e10701fecd802038bf7..905d7ef225253a55cdf7f94ab0171e5c8afb3e01 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,15 @@
+Sat Nov 24 13:39:51 2001  Manish Singh  <yosh@gimp.org>
+
+       * gdk/linux-fb/gdkdrawable-fb2.c
+       * gdk/linux-fb/gdkpango-fb.c: update to latest Pango API
+
+       * gdk/linux-fb/gdkwindow-fb.c: implement gdk_window_show_unraised
+
+       * gdk/linux-fb/gdkfont-fb.c (gdk_font_load): plug memleak on
+       set_family
+       
+       * gdk/linux-fb/gdkfbswitch.c: minor cleanups
+
 Sat Nov 24 22:05:27 2001  Kristian Rietveld  <kristian@planet.nl>
 
        * gtk/gtkmenushell.c (gtk_menu_shell_button_release): don't

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 093f0add5186629092526e10701fecd802038bf7..905d7ef225253a55cdf7f94ab0171e5c8afb3e01 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,15 @@
+Sat Nov 24 13:39:51 2001  Manish Singh  <yosh@gimp.org>
+
+       * gdk/linux-fb/gdkdrawable-fb2.c
+       * gdk/linux-fb/gdkpango-fb.c: update to latest Pango API
+
+       * gdk/linux-fb/gdkwindow-fb.c: implement gdk_window_show_unraised
+
+       * gdk/linux-fb/gdkfont-fb.c (gdk_font_load): plug memleak on
+       set_family
+       
+       * gdk/linux-fb/gdkfbswitch.c: minor cleanups
+
 Sat Nov 24 22:05:27 2001  Kristian Rietveld  <kristian@planet.nl>
 
        * gtk/gtkmenushell.c (gtk_menu_shell_button_release): don't

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 093f0add5186629092526e10701fecd802038bf7..905d7ef225253a55cdf7f94ab0171e5c8afb3e01 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,15 @@
+Sat Nov 24 13:39:51 2001  Manish Singh  <yosh@gimp.org>
+
+       * gdk/linux-fb/gdkdrawable-fb2.c
+       * gdk/linux-fb/gdkpango-fb.c: update to latest Pango API
+
+       * gdk/linux-fb/gdkwindow-fb.c: implement gdk_window_show_unraised
+
+       * gdk/linux-fb/gdkfont-fb.c (gdk_font_load): plug memleak on
+       set_family
+       
+       * gdk/linux-fb/gdkfbswitch.c: minor cleanups
+
 Sat Nov 24 22:05:27 2001  Kristian Rietveld  <kristian@planet.nl>
 
        * gtk/gtkmenushell.c (gtk_menu_shell_button_release): don't

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 093f0add5186629092526e10701fecd802038bf7..905d7ef225253a55cdf7f94ab0171e5c8afb3e01 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,15 @@
+Sat Nov 24 13:39:51 2001  Manish Singh  <yosh@gimp.org>
+
+       * gdk/linux-fb/gdkdrawable-fb2.c
+       * gdk/linux-fb/gdkpango-fb.c: update to latest Pango API
+
+       * gdk/linux-fb/gdkwindow-fb.c: implement gdk_window_show_unraised
+
+       * gdk/linux-fb/gdkfont-fb.c (gdk_font_load): plug memleak on
+       set_family
+       
+       * gdk/linux-fb/gdkfbswitch.c: minor cleanups
+
 Sat Nov 24 22:05:27 2001  Kristian Rietveld  <kristian@planet.nl>
 
        * gtk/gtkmenushell.c (gtk_menu_shell_button_release): don't

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 093f0add5186629092526e10701fecd802038bf7..905d7ef225253a55cdf7f94ab0171e5c8afb3e01 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,15 @@
+Sat Nov 24 13:39:51 2001  Manish Singh  <yosh@gimp.org>
+
+       * gdk/linux-fb/gdkdrawable-fb2.c
+       * gdk/linux-fb/gdkpango-fb.c: update to latest Pango API
+
+       * gdk/linux-fb/gdkwindow-fb.c: implement gdk_window_show_unraised
+
+       * gdk/linux-fb/gdkfont-fb.c (gdk_font_load): plug memleak on
+       set_family
+       
+       * gdk/linux-fb/gdkfbswitch.c: minor cleanups
+
 Sat Nov 24 22:05:27 2001  Kristian Rietveld  <kristian@planet.nl>
 
        * gtk/gtkmenushell.c (gtk_menu_shell_button_release): don't

diff --git a/gdk/linux-fb/.cvsignore b/gdk/linux-fb/.cvsignore
index 10f8f3eec33df9ed1984abd94cf33b4314d9648d..e98872f5a94903e7d2ac46a3f0bf125b8f90859a 100644 (file)
--- a/gdk/linux-fb/.cvsignore
+++ b/gdk/linux-fb/.cvsignore
@@ -6,3 +6,5 @@ _libs
 .libs
 libgdk-x11.la
 gxid
+gdkfbmanager
+gdkfbswitch

diff --git a/gdk/linux-fb/gdkdrawable-fb2.c b/gdk/linux-fb/gdkdrawable-fb2.c
index fcca45bf0f65e9d66815a3096f462d61d8fe01a0..4c5cfd2f7cd65f159b469a3d6bbd3db442a81e08 100644 (file)
--- a/gdk/linux-fb/gdkdrawable-fb2.c
+++ b/gdk/linux-fb/gdkdrawable-fb2.c
@@ -1185,7 +1185,6 @@ _gdk_fb_draw_glyphs (GdkDrawable      *drawable,
 {
   GdkFBDrawingContext fbdc;
   GdkPixmapFBData pixmap;
-  PangoFT2Subfont subfont_index;
   PangoGlyphInfo *gi;
   FT_Face face;
   FT_UInt glyph_index;
@@ -1211,9 +1210,8 @@ _gdk_fb_draw_glyphs (GdkDrawable      *drawable,
     {
       if (gi->glyph)
        {
-         glyph_index = PANGO_FT2_GLYPH_INDEX (gi->glyph);
-         subfont_index = PANGO_FT2_GLYPH_SUBFONT (gi->glyph);
-         face = pango_ft2_get_face (font, subfont_index);
+         glyph_index = gi->glyph;
+         face = pango_ft2_font_get_face (font);
 
          if (face)
            {

diff --git a/gdk/linux-fb/gdkfbswitch.c b/gdk/linux-fb/gdkfbswitch.c
index 707325f8f2e8ad5e61a040e488d21b46dcc750f3..b42c49cc4b3a1cb744c0c47363fd5df04c862a9c 100644 (file)
--- a/gdk/linux-fb/gdkfbswitch.c
+++ b/gdk/linux-fb/gdkfbswitch.c
@@ -1,8 +1,10 @@
 #include <glib.h>
 
+#include <stdlib.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>
+#include <unistd.h>
 
 #include "gdkfbmanager.h"
 
@@ -72,4 +74,6 @@ main (int argc, char *argv[])
   /* Request a switch-to */
   send (fd, &init_msg, sizeof (init_msg), 0);
   g_print ("requested a switch to pid %d\n", init_msg.data);
+
+  return 0;
 }

diff --git a/gdk/linux-fb/gdkfont-fb.c b/gdk/linux-fb/gdkfont-fb.c
index 2ae5354ddf93fe0c4fd65b5d209d8f834987b958..c3b35940bce8dfbb2937a3f0c8b357b7904d67a8 100644 (file)
--- a/gdk/linux-fb/gdkfont-fb.c
+++ b/gdk/linux-fb/gdkfont-fb.c
@@ -182,7 +182,7 @@ gdk_font_load (const gchar *font_name)
       break;
 
     if (strcmp (pieces[2], "*")!=0)
-      pango_font_description_set_family (desc, g_strdup (pieces[2]));
+      pango_font_description_set_family (desc, pieces[2]);
     
     if (!pieces[3])
       break;
@@ -212,7 +212,7 @@ gdk_font_load (const gchar *font_name)
       break;
 
     if (strcmp (pieces[7], "*")!=0)
-      pango_font_description_set_size  (desc, atoi (pieces[7]) * PANGO_SCALE);
+      pango_font_description_set_size (desc, atoi (pieces[7]) * PANGO_SCALE);
     if (pango_font_description_get_size (desc) == 0)
       pango_font_description_set_size (desc, 12 * PANGO_SCALE);
     
@@ -224,7 +224,7 @@ gdk_font_load (const gchar *font_name)
 
   gdk_font_hash_insert (GDK_FONT_FONT, font);
 
-  g_strfreev(pieces);
+  g_strfreev (pieces);
 
   pango_font_description_free (desc);
   

diff --git a/gdk/linux-fb/gdkpango-fb.c b/gdk/linux-fb/gdkpango-fb.c
index 5a821cad0d81a1e17be5f62b978f39a105948de9..c983bf71d7da36891fede0dca428aea272d7d428 100644 (file)
--- a/gdk/linux-fb/gdkpango-fb.c
+++ b/gdk/linux-fb/gdkpango-fb.c
@@ -7,5 +7,5 @@
 PangoContext *
 gdk_pango_context_get (void)
 {
-  return pango_ft2_get_context ();
+  return pango_ft2_get_context (75.0, 75.0);
 }

diff --git a/gdk/linux-fb/gdkwindow-fb.c b/gdk/linux-fb/gdkwindow-fb.c
index 1755fe4857504163973b13f1c154c2209d57c0bb..13244b764731513d3a6e45c882380f2477744dfe 100644 (file)
--- a/gdk/linux-fb/gdkwindow-fb.c
+++ b/gdk/linux-fb/gdkwindow-fb.c
@@ -739,8 +739,9 @@ gdk_fb_window_send_crossing_events (GdkWindow *src,
     }
 }
 
-void
-gdk_window_show (GdkWindow *window)
+static void
+show_window_internal (GdkWindow *window,
+                      gboolean   raise)
 {
   GdkWindowObject *private;
   GdkWindow *mousewin;
@@ -752,7 +753,9 @@ gdk_window_show (GdkWindow *window)
   if (!private->destroyed && !GDK_WINDOW_IS_MAPPED (private))
     {
       private->state = 0;
-      gdk_fb_window_raise (window);
+
+      if (raise)
+        gdk_fb_window_raise (window);
       
       if (all_parents_shown ((GdkWindowObject *)private->parent))
        {
@@ -779,6 +782,22 @@ gdk_window_show (GdkWindow *window)
     }
 }
 
+void
+gdk_window_show_unraised (GdkWindow *window)
+{
+  g_return_if_fail (window != NULL);
+
+  show_window_internal (window, FALSE);
+}
+
+void
+gdk_window_show (GdkWindow *window)
+{
+  g_return_if_fail (window != NULL);
+
+  show_window_internal (window, TRUE);
+}
+
 void
 gdk_window_hide (GdkWindow *window)
 {